From 1a710f56e7fdc0f3d4014b2f219b94b78b44a44d Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Mon, 22 Aug 2005 23:07:37 +0000 Subject: [PATCH] Fix compiler warnings. Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c | 2 ++ linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c | 3 +++ linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c | 2 ++ linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c | 2 ++ 4 files changed, 9 insertions(+) diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c index 2e8aa94670..3a984a61a6 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c @@ -784,7 +784,9 @@ static int __init smp_scan_config (unsigned long base, unsigned long length) void __init find_smp_config (void) { +#ifndef CONFIG_XEN unsigned int address; +#endif /* * FIXME: Linux assumes you have 640K of base ram.. diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c index 45787ddf5b..96c4317c71 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c @@ -1604,6 +1604,9 @@ static void smp_intr_exit(void) unbind_ipi_from_irq(CALL_FUNCTION_VECTOR); } +extern void local_setup_timer_irq(void); +extern void local_teardown_timer_irq(void); + void smp_suspend(void) { /* XXX todo: take down time and ipi's on all cpus */ diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c index f1c4d138f9..47fdcc9fdf 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c @@ -435,9 +435,11 @@ void unbind_evtchn_from_irqhandler(unsigned int evtchn, void *dev_id) unbind_evtchn_from_irq(evtchn); } +#ifdef CONFIG_SMP static void do_nothing_function(void *ign) { } +#endif /* Rebind an evtchn so that it gets delivered to a specific cpu */ static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu) diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c index 40155615c1..1f460f91ef 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c @@ -11,6 +11,8 @@ * Copyright (c) 2005, Christopher Clark */ +#include +#include #include "common.h" /* -- 2.30.2